bitkeeper revision 1.1108.2.20 (4100050ee2rhUkBYDjTlzUWJXwt3Dg)

make 'make install' work more than once if the installed files are not writable

diff --git a/tools/sv/Makefile b/tools/sv/Makefile
index cc411b7a119323dde7110159f463e30c968179be..0321a566f3ad419085118382974e582739df547e 100755 (executable)
--- a/tools/sv/Makefile
+++ b/tools/sv/Makefile
@@ -3,38 +3,37 @@ sv_insdir := $(prefix)/var/xen/sv
 all:
 
 install:
-
-
        # make parent directory
        mkdir -p $(sv_insdir)
        
        # copy Main.rpy file - references xen.sv.Main class
-       cp Main.rpy $(sv_insdir)/
+       install -m0644 Main.rpy $(sv_insdir)
 
        # make images folder
        mkdir -p $(sv_insdir)/images
        
        # copy images
-       cp images/xen.png       $(sv_insdir)/images/
-       cp images/orb_01.jpg    $(sv_insdir)/images/
-       cp images/orb_02.jpg    $(sv_insdir)/images/
+       install -m0644 images/xen.png $(sv_insdir)/images
+       install -m0644 images/orb_01.jpg $(sv_insdir)/images
+       install -m0644 images/orb_02.jpg $(sv_insdir)/images
        
-       cp images/left-end-highlight.jpg        $(sv_insdir)/images/
-       cp images/left-end-no-highlight.jpg     $(sv_insdir)/images/
-       cp images/right-end-highlight.jpg       $(sv_insdir)/images/
-       cp images/right-end-no-highlight.jpg    $(sv_insdir)/images/
+       install -m0644 images/left-end-highlight.jpg $(sv_insdir)/images
+       install -m0644 images/left-end-no-highlight.jpg $(sv_insdir)/images
+       install -m0644 images/right-end-highlight.jpg $(sv_insdir)/images
+       install -m0644 images/right-end-no-highlight.jpg $(sv_insdir)/images
 
-       cp images/middle-highlight.jpg          $(sv_insdir)/images/
-       cp images/middle-no-highlight.jpg       $(sv_insdir)/images/
+       install -m0644 images/middle-highlight.jpg $(sv_insdir)/images
+       install -m0644 images/middle-no-highlight.jpg $(sv_insdir)/images
        
-       cp images/seperator.jpg                 $(sv_insdir)/images/
-       cp images/seperator-left-highlight.jpg  $(sv_insdir)/images/
-       cp images/seperator-right-highlight.jpg $(sv_insdir)/images/
+       install -m0644 images/seperator.jpg $(sv_insdir)/images
+       install -m0644 images/seperator-left-highlight.jpg $(sv_insdir)/images
+       install -m0644 images/seperator-right-highlight.jpg $(sv_insdir)/images
 
        # make include folder
        mkdir -p $(sv_insdir)/inc
        
-       #copy stylesheet
-       cp inc/style.css $(sv_insdir)/inc/
+       # copy stylesheet
+       install -m0644 inc/style.css $(sv_insdir)/inc
 
 clean:
+